WiX: package up the experimental dynamic SDK and the runtime redistributables #456
+1,288
−2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The shims are architecture agnostic and should go on the shared disk. Thanks to @etcwilde for pointing this out!
This ads the dynamic library set to the experimental SDK making it relevant for most users.
Add MSMs and MSis for the new experimental runtime. This is needed to distribute the runtime portion of the experimental SDK.
mhegazy
reviewed
Aug 27, 2025
| @@ -19,14 +19,20 @@ | |||
|
|
|||
| <ItemGroup Condition=" $(WindowsArchitectures.Contains('i686')) "> | |||
| <ProjectReference Include="..\..\rtl\msm\rtlmsm.wixproj" Properties="Platform=x86;ProductArchitecture=x86" BindName="rtl.x86.msm" /> | |||
There was a problem hiding this comment.
nit. would be nice to change the existing one to have similar name and folder structure e.g. rtl\legacy\msm\rtl.legacy.msm.wixproj
mhegazy
reviewed
Aug 27, 2025
| <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_Builtin_float.swiftmodule\i686-unknown-windows-msvc.swiftmodule" /> | ||
| </Component> | ||
|
|
||
| <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x86"> |
There was a problem hiding this comment.
nevermind. we have it on the directory.
mhegazy
reviewed
Aug 27, 2025
| <?if $(sys.BUILDARCH) == x64 ?> | ||
| <?define RuntimeDirectoryComponentGuidGenerationSeed = "E33B165B-8460-467D-ABCD-27EA8197A3CF" ?> | ||
| <?define RuntimeRoot = $(WindowsExperimentalRuntimeX64)?> | ||
| <?elseif $(sys.BUILDARCH) == arm64 ?> |
There was a problem hiding this comment.
nit. in most other places, order is arm64, x64, x86
mhegazy
approved these changes
Aug 27, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request introduces experimental shared and static runtime installer modules for Windows, with supporting build logic and packaging for multiple architectures. The changes add new WiX project files, update build properties, and integrate these new runtimes into the Windows installer and merge module pipelines.
Experimental Runtime Packaging and Build Integration
Added new WiX project and source files for experimental shared runtime (
rtl.shared.lib.wixproj,rtl.shared.lib.wxs), merge module (rtl.shared.msm.wixproj,rtl.shared.msm.wxs), and MSI installer (rtl.shared.msi.wixproj,rtl.shared.msi.wxs), as well as for the static runtime merge module (rtl.static.msm.wixproj,rtl.static.msm.wxs). These include component definitions for distributing Swift runtime DLLs and utilities for x86, x64, and ARM64 architectures. [1] [2] [3] [4] [5] [6] [7] [8]Updated
Directory.Build.propsandSideBySideUpgradeStrategy.propsto add new constants and upgrade codes for the experimental runtimes, enabling them to be referenced and versioned appropriately in the build and installer processes. [1] [2] [3]Installer and Build Pipeline Updates
Modified
Directory.Build.targetsto generalize project reference logic and exclude the new runtime modules from unnecessary references, improving build maintainability and reducing redundant dependencies.Integrated the new shared and static runtime merge modules into the main Windows installer (
installer.wixproj) and platform-specific installer projects (windows.wixproj), ensuring these experimental runtimes are included for all supported architectures. [1] [2]